Merge pull request #306 from apenney/fix-changelog