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