c50a014 Merge branch 'master' into epel7

Merged and Committed by epienbro 8 years ago
    Merge branch 'master' into epel7
    
        
file modified
+2 -1
file modified
+79 -44
file modified
+1 -1