Sync'd branch projects/gum with upstream @ Wed Nov  5 02:47:07 PST 2014