Merge branch feature/jorgen.lind/timings_and_performance with...
Merge branch feature/jorgen.lind/timings_and_performance with refs/heads/master into refs/merge-requests/48/train
Merge branch feature/jorgen.lind/timings_and_performance with refs/heads/master into refs/merge-requests/48/train