0da147a Merge branch 'master' into epel7

Merged and Committed by michich 6 years ago
    Merge branch 'master' into epel7
    
        
file modified
+4 -1
file modified
+3 -0