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