4014d6f Auto-sync with upstream master

Authored and Committed by submachine 6 years ago
    Auto-sync with upstream master
    
    Upstream commit: 231a59ce2c5719d2d77752c21092960e28837b4a
    
        
file modified
+1 -0
file modified
+17 -2
file modified
+1 -1