merged v1.0.x-maint into master

There were a couple of bug fixes in maint that had not yet been merged into master, so I just did that. I'm pretty sure it is OK, but in view of the impending release, checking and testing is particularly welcome.

Eric