Sync'd branch projects/gum with upstream @ Mon Sep  8 09:40:00 PDT 2014