0b05408 Auto-sync with upstream master

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