8276635 Merge branch 'master' into epel7

Merged and Committed by laxathom 9 years ago
    Merge branch 'master' into epel7
    
        
file modified
+1 -0
file modified
+7 -8
file modified
+1 -1