Merge dev into master for 1.2 release.