22b8c35 Merge branch 'master' into epel7

Merged and Committed by limb 4 years ago
    Merge branch 'master' into epel7
    
        
file modified
+43 -29