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