Sync'd branch projects/gum with upstream @ Mon Sep  8 15:04:27 PDT 2014