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