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

Merge branch feature/jorgen.lind/json_output with refs/heads/master into refs/merge-requests/381/train
3 jobs for !381 with feature/jorgen.lind/json_output into master in 21 minutes and 26 seconds
merge train