port 1.1.2 changelog to master
2 files changed