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