Sync to proposed 1.2.1 release