Changes on stable

[John W. Eaton]

Now that there have been so many changes to the sources on the default 
branch, merging from stable is likely to be difficult so should probably 
be done after nearly every change on stable to avoid confusion about 
what changes need to be made to resolve conflicts.

My intent is to work toward a new 4.2 release from default as soon as 
possible, but that is still probably a few months away.

jwe