762e747 Auto-sync with upstream master

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