Merge branch 'ogolowinski-master-patch-06242' of gitlab.com:gitlab-org/gitlab into ogolowinski-master-patch-06242