b78534c Merge branch 'master' into epel7

Merged and Committed by jpopelka 7 years ago
    Merge branch 'master' into epel7
    
        
file removed
-185
file modified
+28 -5