Sync'd branch projects/gum with upstream @ Mon Oct 20 04:36:47 PDT 2014