Merge back into default branch.

Seems that work had proceeded on another branch...  Probably time to merge back.