Fix compilation error on Windows introduced by 6bafd739f7a4d8ca23ef6013c57618ddce52a4bc
Merge branch 'master' into master_with_coverage