Merge branch 'MsBuildFix' into 'master'

Ms build fix

See merge request !27
2 jobs for master in 10 minutes and 35 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Windows
passed #259417
Windows10
masterJobWindows

00:05:42

 
  Linux
passed #259418
masterJobLinux

00:04:52

91.0%