190fd58 Auto-sync with upstream release/2.25/master

Authored and Committed by submachine 7 years ago
    Auto-sync with upstream release/2.25/master
    
    Upstream commit: 34b6f41c14d09fe627c6a6224880d76d0959079e
    
        
file removed
-1
file modified
+7 -2
file modified
+1 -1