Merge in release notes from 1.2.1