Sync'd branch projects/gum with upstream @ Tue Oct 21 10:49:12 PDT 2014