Sync'd branch projects/gum with upstream @ Fri Sep 19 15:23:19 PDT 2014