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
3 jobs for !48 with feature/jorgen.lind/timings_and_performance into master in 8 minutes and 8 seconds (queued for 1 second)
merge train