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