Merge branch 'sk/mingw-tests-workaround'