b3f31c5 Update to upstream 1.18

Authored and Committed by rebus 9 years ago
    Update to upstream 1.18
    
        
file modified
+2 -0
file modified
+7 -3
file modified
+2 -1