Merge remote-tracking branch 'gcmalloc/master'