Default merged to stable for upcoming 4.2 release

[John W. Eaton]

I've merged default to stable for the upcoming 4.2 release.

Any changes that should be a part of the 4.2 release should be made on 
stable now and (eventually) merged back to default.  The default branch 
is open again for any development, not just bug fixes related to the 
release.

If changes that need to be part of the release are accidentally made on 
default, they can always be grafted on to the stable branch.  But it 
would better to make them on stable initially.

jwe