[Don't merge] v6.1.2 - preemtive PR

Just the v numbers bumped with the changelog updated too.

Once we've merged #360 and #358 I'll rebase this.