I fixed the merge conflicts, is there something else left to do?

These broken links continue to get reported,
see #681, #755, #792, as well as the already mentioned #552.
It would be nice to merge this :)

Apologies for the delay. If someone rebases this, I'm more than happy to merge it.

I had a quick try at rebasing, but there accumulated a lot of merge conflicts at this point.

Not sure when I will be able to do this.