Merge branch 'development' into 'master'

Merge dev -> master

See merge request !103
8 jobs for master in 5 minutes and 29 seconds (queued for 7 seconds)
Name Stage Failure
failed
compileWin Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log
failed
compileUnix Build
...skipped 9 targets...
...updated 4618 targets...
CMakeFiles/Boost.dir/build.make:110: recipe for target 'Boost/src/Boost-stamp/Boost-build' failed
make[2]: *** [Boost/src/Boost-stamp/Boost-build] Error 1
make[1]: *** [CMakeFiles/Boost.dir/all] Error 2
CMakeFiles/Makefile2:67: recipe for target 'CMakeFiles/Boost.dir/all' failed
make: *** [all] Error 2
Makefile:127: recipe for target 'all' failed
ERROR: Job failed: exit code 1