85a4b81 Merge branch 'master' into epel7

Merged and Committed by radez 5 years ago
    Merge branch 'master' into epel7
    
        
file added
+13
file removed
-1
file added
+352
file added
+2