Sync'd branch projects/gum with upstream @ Fri Oct 31 13:31:04 PDT 2014