8f8a767 Update to upstream 0.18.5

Authored and Committed by stefw 10 years ago
    Update to upstream 0.18.5
    
        
file modified
+13 -2
file modified
+1 -1