2358892 Rebase to upstream 0.4.8

Authored and Committed by puiterwijk 10 years ago
    Rebase to upstream 0.4.8
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+5 -2