Sync'd branch projects/gum with upstream @ Fri Oct  3 09:29:04 PDT 2014