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