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

7 jobs for maint-1.1 in 42 minutes and 40 seconds (queued for 2 seconds)