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