Merge pull request #2520 from reaperhulk/port-changelog

port 1.1.2 changelog to master