Merge pull request #1718 from madewokherd/sgenthreadcleanup