Merge branch 'release-2.1.0' into develop
increased timeout for tests (because of typescript)
Merge branch 'tests' into develop
version 2.1.1
Merge branch 'release-2.1.1'