Merge branches 'feature/project-import' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import