Merge branch 'master' into 'master'

Unit tests

See merge request !30
4 jobs for master in 32 minutes and 29 seconds (queued for 4 seconds)