Sync'd branch projects/gum with upstream @ Fri Nov  7 07:03:09 PST 2014