3d565a8 Merge branch 'master' into epel7

Merged and Committed by limb 7 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+11 -8
file modified
+1 -1