Sync'd branch projects/gum with upstream @ Tue Oct 28 12:01:06 PDT 2014