Merge pull request #2107 from reaperhulk/port-0.9.2-changelog

port the 0.9.2 changelog to master