Merge branch alfroch-add-integration-test with refs/heads/master into refs/merge-requests/405/train

40 jobs for !405 with alfroch-add-integration-test into master in 11 minutes and 47 seconds (queued for 11 seconds)
merge train