Bump version (minor)
Merge branch 'dev'