d579c1a Auto-sync with upstream master

Authored and Committed by Siddhesh Poyarekar 9 years ago
    Auto-sync with upstream master
    
        
file modified
+5 -2
file modified
+1 -1