44e7da8 Auto-sync with upstream master

Authored and Committed by fweimer 6 years ago
    Auto-sync with upstream master
    
    Upstream commit: 89f6307c5d270ed4f11cee373031fa9f2222f2b9
    
        
file modified
+6 -2
file modified
+1 -1