Merge branch '10-3-stable-prepare-rc1' of https://gitlab.com/gitlab-org/gitlab-ce into 10-3-stable-prepare-rc1