eb3d388 Auto-sync with upstream master

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