Oops, bump version
Merge branch 'refs/heads/dev'