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