dbf9294 Merge branch 'master' into epel7

Merged and Committed by Mystro256 7 years ago
    Merge branch 'master' into epel7
    
        
file added
+83
file modified
+19 -2