Merge branch 'fix-win-tests-compat' into fix-win-tests
authorjneira <atreyu.bbb@gmail.com>
Thu, 18 Jul 2019 12:59:00 +0000 (14:59 +0200)
committerjneira <atreyu.bbb@gmail.com>
Thu, 18 Jul 2019 12:59:00 +0000 (14:59 +0200)

Trivial merge