Sync'd branch projects/gum with upstream @ Thu Oct 16 09:20:11 PDT 2014