aff24aa Merge branch 'master' into el6

Merged and Committed by dchen 8 years ago
    Merge branch 'master' into el6
    
        
file modified
+1 -0
file modified
+13 -4
file modified
+1 -1