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

Merge branch feature/jorgen.lind/java_openvds_dem with refs/heads/master into refs/merge-requests/485/train
3 jobs for !485 with feature/jorgen.lind/java_openvds_dem into master in 17 minutes and 55 seconds (queued for 4 seconds)
merge train