835049c Auto-sync with upstream master

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