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
Merge branch feature/jorgen.lind/java_openvds_dem with refs/heads/master into refs/merge-requests/485/train