Sync'd branch projects/gum with upstream @ Thu Oct 30 03:46:07 PDT 2014