Bump version.
Tweak to force push.
Fix merge error.
Fix merge error.
Fix merge error.
Merge branch 'v6' into develop