adbfe47 Auto-sync with upstream master.

Authored and Committed by Siddhesh Poyarekar 8 years ago
    Auto-sync with upstream master.
    
        
file modified
+10 -2
file modified
+1 -1