Sync'd branch projects/gum with upstream @ Wed Oct 29 06:50:09 PDT 2014