Debian maintainers have taken over development, making a new release 2.87. We should probably check which of our patches they have integrated and rebase all others on top of 2.87.
rebase, pushed upstream, and added to the tree