Sync'd branch projects/gum with upstream @ Thu Oct 16 13:38:13 PDT 2014