8d10e61 Auto-sync with upstream master

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master
    
    Up to commit f531f93056b34800383c5154280e7ba5112563c7.
    
        
file modified
+1 -0
file modified
+7 -2
file modified
+1 -1