Sync'd branch projects/gum with upstream @ Tue Oct 14 03:06:09 PDT 2014