Sync'd branch projects/gum with upstream @ Thu Oct 30 23:35:09 PDT 2014