Sync'd branch projects/gum with upstream @ Mon Oct 27 13:15:16 PDT 2014