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
Merge branch feature/jorgen.lind/overlapped_event with refs/heads/master into refs/merge-requests/407/train