Sync'd branch projects/gum with upstream @ Tue Nov  4 13:24:08 PST 2014