Merge pull request #2487 from reaperhulk/port-changelog

port the 1.1.1 changelog to master