880982b Import upstream 1.1.6

Authored and Committed by imcleod 9 years ago
    Import upstream 1.1.6
    
        
file modified
+1 -0
file modified
+29 -2
file modified
+1 -1