f03231b Sync with upstream master

Authored and Committed by Siddhesh Poyarekar 7 years ago
    Sync with upstream master
    
        
file removed
-46
file modified
+0 -9
file removed
-73
file modified
+6 -10
file modified
+1 -1