Sync'd branch projects/gum with upstream @ Wed Nov  5 17:01:01 PST 2014