Merge remote-tracking branch 'gcmalloc/master' into fork_master