Update to 6.5.0

I had prepared this a week or so ago, then I got into a rabbit hole of cleaning up things that are not strictly necessary for incorporating the upstream release... Let's not delay this further, the clean-ups can go into 6.5.0-2 or 6.6.0-1.