3ee46a8 Update to upstream version 1.10

Authored and Committed by mbooth 9 years ago
    Update to upstream version 1.10
    
        
file modified
+2 -0
file modified
+6 -3
file modified
+1 -1