ce1e001 Merge branch 'master' into el6

Merged and Committed by cra 8 years ago
    Merge branch 'master' into el6
    
        
file modified
+3 -0
file modified
+20 -2
file modified
+1 -1