Update port to version R7B-4, with updated documentation tarball. I also
had to rework the documentation merging process because it thought that
1.9 became after 1.10, breaking the merge for this release.