Merge branch 'master' into develop
incrementing to development version 2.1-SNAPSHOT
Increasing thread safety
incrementing to version 2.1
Merge branch 'release-2.1'