Merge changes from master.
Make more tests pass.