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