Merge 1.2.x into master

There have been some test fixes, so merge those in.

Rebased to remove the 1.2.0 prep, since 1.2.0 actually hasn't been released yet, changelog is out of date, etc.