36702a1 Auto-sync with upstream master.

Authored and Committed by Carlos O'Donell 7 years ago
    Auto-sync with upstream master.
    
    Upstream commit: e299076fefd9649f78f853865d4745043e50813c
    
        
file modified
+9 -11
file modified
+12 -12
file modified
+5 -2
file modified
+1 -1