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