Merge pull request #472 from gcmalloc/master