Merge dev into master for Phase III release.