Sync'd branch projects/gum with upstream @ Wed Oct 29 17:49:37 PDT 2014