Sync'd branch projects/gum with upstream @ Thu Oct  2 09:24:13 PDT 2014