a928b2e Auto-sync with upstream branch master

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