Sync'd branch projects/gum with upstream @ Thu Oct 30 12:24:06 PDT 2014