Merge branch 'calebw-master-patch-55976' of gitlab.com:gitlab-org/gitlab into calebw-master-patch-55976