Sync'd branch projects/gum with upstream @ Thu Oct 16 08:14:09 PDT 2014