port the 1.2.1 changelog to master
1 file changed