Merge branch 'windows-fixes' into 'master'

Windows fixes

See merge request !10
1 job for master in 17 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #109714
linux

00:00:17