Sync'd branch projects/gum with upstream @ Mon Oct 13 09:44:11 PDT 2014