Master merge

Another merge with master.

All tests pass.