Merge branch feature/jorgen.lind/2.0_buildscripts with refs/heads/2.0 into...

Merge branch feature/jorgen.lind/2.0_buildscripts with refs/heads/2.0 into refs/merge-requests/393/train