Originally opened at !637 (closed) by @stanhu.
Closes https://github.com/gitlabhq/gitlabhq/issues/9265