f6288a0 Auto-sync with upstream master.

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master.
    
    Upstream commit ID is f79211792127f38d5954419bb3784c8eb7f5e4e5.
    
        
file modified
+6 -2
file modified
+1 -1