f0047da Merge branch 'master' into el6

Merged and Committed by dchen 8 years ago
    Merge branch 'master' into el6
    
        
file modified
+5 -18
file modified
+1 -1
file modified
+28 -9