8789df0 Merge remote-tracking branch 'origin/master' into el6

Merged and Committed by kevin 7 years ago
    Merge remote-tracking branch 'origin/master' into el6
    
        
file modified
+1 -0
file removed
-33
file modified
+5 -12
file modified
+1 -1