Pick !32538 into auto deploy for 20190901
What does this MR do?
This picks the change from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32538 into the auto deploy branch, based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/32538#note_211244737.
Edited by Andreas Brandl