Merge branch feature/erlend.simonsen/cpack_stuff with refs/heads/master into...

Merge branch feature/erlend.simonsen/cpack_stuff with refs/heads/master into refs/merge-requests/94/train
3 jobs for !94 with feature/erlend.simonsen/cpack_stuff into master in 8 minutes and 7 seconds (queued for 1 second)
merge train