434cf9e Auto-sync with upstream master

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