9ec5714 Merge branch 'master' into el6

Merged and Committed by dchen 9 years ago
    Merge branch 'master' into el6
    
        
file modified
+11 -1