Merge branch 1.0 with refs/heads/master into refs/merge-requests/188/train

3 jobs for !188 with 1.0 into master in 6 minutes and 1 second (queued for 1 second)
merge train