Sync'd branch projects/gum with upstream @ Mon Nov  3 17:49:13 PST 2014