Sync'd branch projects/gum with upstream @ Wed Oct 29 11:55:14 PDT 2014