Merge branch 'hv/mingw-fs-funnies' into next