4cc0814 Auto-sync with upstream master.

Authored and Committed by fweimer 8 years ago
    Auto-sync with upstream master.
    
        
file removed
-6034
file modified
+5 -2
file modified
+1 -1