8b2fce2 Merge branch 'master' into epel7

Merged and Committed by sdgathman 8 years ago
    Merge branch 'master' into epel7
    
        
file modified
+70 -23
file modified
+17 -13
file modified
+6 -1
file modified
+40 -6