Merge pull request #2697 from reaperhulk/1.2.2-changelog

update changelog and version for 1.2.2