Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'