46b9e17 Import upstream patches after 1.8.2

Authored and Committed by bengal 6 years ago
    Import upstream patches after 1.8.2
    
        
file modified
+6 -2