Sync'd branch projects/gum with upstream @ Fri Oct  3 05:06:07 PDT 2014