Sync'd branch projects/gum with upstream @ Sun Nov  2 19:39:15 PST 2014