Merge branch teamcity-integration.