d0c57f6 Auto-sync with upstream master

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