Fixes setup typo
Bumps version number
Merge branch 'release/1.2b1' into develop