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

Merge branch feature/jorgen.lind/overlapped_event with refs/heads/master into refs/merge-requests/407/train
3 jobs for !407 with feature/jorgen.lind/overlapped_event into master in 29 minutes and 7 seconds (queued for 2 seconds)
merge train