8b0d66e Auto-sync with upstream master

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