Sync'd branch projects/gum with upstream @ Tue Oct  7 12:51:16 PDT 2014