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

3 jobs for !190 with 1.0 into master in 5 minutes and 25 seconds (queued for 1 second)
merge train