Merge branch feature/johan.seland/VDSSpecification with refs/heads/master into...

Merge branch feature/johan.seland/VDSSpecification with refs/heads/master into refs/merge-requests/536/train
3 jobs for !536 with feature/johan.seland/VDSSpecification into master in 28 minutes (queued for 1 second)
merge train