Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce