875ac2f Rebase to 6.0.4 and add some updates from Remi.

Authored and Committed by nathans 4 years ago
    Rebase to 6.0.4 and add some updates from Remi.
    
        
file modified
+2 -0
file modified
+9 -2
file modified
+10 -1
file modified
+2 -2