Bump version.
Fix error in migration.
Merge branch 'v6' into develop