v2.3.0

The next minor release!

Todo:

- [ ] Rebase it, tidying up commits