3413ad5 Merge branch 'master' into el6

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