098d568 Auto-sync with upstream branch master

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