Merge branch alfroch-update-evaluation with refs/heads/master into refs/merge-requests/284/train

30 jobs for !284 with alfroch-update-evaluation into master in 11 minutes and 34 seconds (queued for 12 seconds)
merge train