Merging in changes from r23a1-branch.  Doc/makefile had conflicts, which
I leave to Fred to sort out.
2 files changed