Sync'd branch projects/gum with upstream @ Thu Nov  6 18:44:10 PST 2014