f76836 Sync with upstream master.

Authored and Committed by Carlos O'Donell 4 years ago
    Sync with upstream master.
    
        
file modified
+301 -330
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1