Merge branch 'fix_build' into 'master'

fix build

See merge request !2
1 job for master in 5 minutes and 13 seconds (queued for 3 seconds)