Merge pull request #1737 from rubenk/pthread-cleanup