Merge pull request #1815 from jbevain/clean-mutex-windows