bugfix for typo
version bump
Merge branch 'master' into bixly-testing