Sync'd branch projects/gum with upstream @ Tue Nov  4 13:36:09 PST 2014