33cac08 Update to upstream 1.6.0 (#1037400, #1107292)

Authored and Committed by pfrields 9 years ago
    Update to upstream 1.6.0 (#1037400, #1107292)
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+6 -4