Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013

# Conflicts:
#   db/schema.rb