Merge remote-tracking branch 'gitlab/merge-requests/71' into maint-1.1

9 jobs for maint-1.1 in 75 minutes and 14 seconds (queued for 20 seconds)