c659285 Auto-sync with upstream master

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master
    
    Upstream commit: 73dfd088936b9237599e4ab737c7ae2ea7d710e1
    
        
file modified
+16 -16
file modified
+13 -14
file removed
-6964
file modified
+13 -10
file modified
+1 -1