Merge pull request #711 from spicypixel/hotfix/appdomain-leak