Sync'd branch projects/gum with upstream @ Fri Oct  3 05:09:06 PDT 2014