Merge branch feature/jorgen.lind/sliceserver with refs/heads/master into...

Merge branch feature/jorgen.lind/sliceserver with refs/heads/master into refs/merge-requests/228/train
3 jobs for !228 with feature/jorgen.lind/sliceserver into master in 5 minutes and 24 seconds
merge train