version bump
Hotfix 2
Merge branch 'hotfix-1.2.1'