372014c Sync with upstream master

Authored and Committed by Siddhesh Poyarekar 7 years ago
    Sync with upstream master
    
    We've sped past 2.19 now.
    
        
file modified
+6 -6
file modified
+2 -2
file modified
+6 -7