Sync'd branch projects/gum with upstream @ Wed Oct 15 06:52:10 PDT 2014