Sync'd branch projects/gum with upstream @ Tue Nov  4 09:59:06 PST 2014