aae7c72 Auto-sync with upstream master

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