Merge branch feature/morten.ofstad/CompressionOptions with refs/heads/master...

Merge branch feature/morten.ofstad/CompressionOptions with refs/heads/master into refs/merge-requests/318/train
3 jobs for !318 with feature/morten.ofstad/CompressionOptions into master in 20 minutes and 50 seconds (queued for 2 seconds)
merge train