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