Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq