Sync'd branch projects/gum with upstream @ Fri Nov  7 14:18:11 PST 2014