0adb907 Auto-sync with upstream master

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master
    
    Upstream commit: 17af5da98cd2c9ec958421ae2108f877e0945451
    
        
file removed
-54
file modified
+10 -3
file modified
+1 -1