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