84baf40 Auto-sync with upstream master

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