Merge pull request #1685 from entireio/soph/changelog-0-8-42