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