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