Prepare for TeamCity build
Clean up
Merge branch 'release-2.1.0'