9db5835 Merge remote-tracking branch 'origin/master' into epel7

Merged and Committed by kevin 8 years ago
    Merge remote-tracking branch 'origin/master' into epel7
    
        
file modified
+7 -3
file modified
+2 -2