263025 Rebase to 1.60

Authored and Committed by Jonathan Wakely 8 years ago
    Rebase to 1.60
    
        
file modified
+46 -21
file modified
+1 -1