ec52db3 Auto-sync with upstream branch master

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