573bcac Auto-sync with upstream master

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master
    
    Upstream commit: 9032070deaa03431921315f973c548c2c403fecc
    
        
file modified
+0 -34
file removed
-33
file modified
+11 -6
file modified
+1 -1