Merge pull request #2657 from reaperhulk/port-1.2.1-changelog

port the 1.2.1 changelog to master