Sync'd branch projects/gum with upstream @ Mon Oct 27 06:42:36 PDT 2014