90f786e Auto-sync with upstream master.

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master.
    
    Upstream commit: ID d9067fca40b8aac156d73cfa44d6875813555a6c
    
        
file removed
-1
file modified
+9 -2
file modified
+1 -1