Sync'd branch projects/gum with upstream @ Thu Oct 30 18:23:09 PDT 2014