Sync'd branch projects/gum with upstream @ Wed Oct 15 07:07:07 PDT 2014