Sync'd branch projects/gum with upstream @ Wed Oct  8 07:33:13 PDT 2014