960fa01 Merge branch 'master' into epel7

Merged and Committed by jhogarth 7 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+25 -5
file modified
+1 -1