Merge branch 'hotfix/2.1.2'
version bump
Merge branch 'hotfix/2.1.3_version_bump' into develop