Merge pull request #3352 from ryan-mccabe/leak-fixes