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