b300a3f Rebased on 0.9 upstream

Authored and Committed by Eoghan Glynn 9 years ago
    Rebased on 0.9 upstream
    
        
file modified
+1 -0
file modified
+5 -3
file modified
+1 -1