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