Sync'd branch projects/gum with upstream @ Tue Oct 14 08:46:07 PDT 2014