Merge branch 'release-0.3'
Merge branch 'release-0.6'
release 0.7A
Finish merge.
Merge again from origin.
Merge done, tests pass.  One more merge to do.