7f89d02 Merge branch 'master' into epel7

Merged and Committed by fab 5 years ago
    Merge branch 'master' into epel7
    
        
file modified
+2 -28
file modified
+5 -1
file modified
+1 -1