Merge branch patch-1 with refs/heads/master into refs/merge-requests/253/train

3 jobs for !253 with patch-1 into master in 6 minutes and 42 seconds (queued for 2 seconds)
merge train