Merge branch 'ssabatie' into 'develop'

Ssabatie

See merge request !36
4 jobs for develop in 1 minute and 44 seconds (queued for 6 seconds)