Merge.

Merge changes in preparation for 1.2.0-RC1.