7e4694d Auto-sync with upstream master

Authored and Committed by fweimer 6 years ago
    Auto-sync with upstream master
    
    Upstream commit: d95fcb2df478efbf4f8537ba898374043ac4561f
    
        
file modified
+2 -0
file modified
+16 -2
file modified
+1 -1