680bff1 Sync with upstream master

Authored and Committed by Siddhesh Poyarekar 9 years ago
    Sync with upstream master
    
        
file removed
-199
file modified
+6 -9
file modified
+1 -1