1.2.x from master

Bringing 1.2.x up to date with master in preparation for the release.