Sync'd branch projects/gum with upstream @ Mon Oct 27 17:41:08 PDT 2014