Merge pull request #1646 from rubenk/cleanup-malloc-calls