This commit was SVN r6873.
This includes updates to the malloc_hook method and making everything components. This commit was SVN r6852.