Merge branch 'master' of git://git.labs.intellij.net/teamcity/git-plugin