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