Attempt to fix test on windows
Merge branch 'release'