7e28f1b Auto-sync with upstream branch master

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