Sync'd branch projects/gum with upstream @ Fri Nov  7 09:39:10 PST 2014