Merge branch 'master' of gitlab.com:gitlab-org/gitlab into 333117-migrate-quickactions-events-redishll
