Merge pull request #2380 from reaperhulk/port-102-changelog

port 1.0.2 changelog to master