Sync'd branch projects/gum with upstream @ Wed Nov  5 04:56:19 PST 2014