9d7b7a7 Auto-sync with upstream master

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