Sync'd branch projects/gum with upstream @ Fri Nov  7 17:23:09 PST 2014