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