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