Version bump in prep for merge with master and new release