Merge branch 'ef/mingw-rmdir'