Merge pull request #946 from luke-jr/bugfix_rm_mingw