Sync'd branch projects/gum with upstream @ Fri Oct 31 19:02:06 PDT 2014