Merge branch alfroch-moving-models with refs/heads/master into refs/merge-requests/196/train

23 jobs for !196 with alfroch-moving-models into master in 17 minutes and 31 seconds (queued for 1 second)
merge train