Merge pull request #647 from CanineHQ/chriszhu__fix-stimulus-memory-leaks