383945e Auto-sync with upstream branch master:

Authored and Committed by djdelorie 5 years ago
    Auto-sync with upstream branch master:
    
    Upstream commit: c6982f7efc1c70fe2d6160a87ee44d871ac85ab0
    
        
file modified
+6 -2
file modified
+1 -1