b1ee101 Auto-sync with upstream branch master

Authored and Committed by fweimer 6 years ago
    Auto-sync with upstream branch master
    
    Upstream commit: d8425e116cdd954fea0c04c0f406179b5daebbb3
    
        
file modified
+138 -241
file modified
+8 -2
file modified
+1 -1