Sync'd branch projects/gum with upstream @ Sat Nov  1 01:46:06 PDT 2014