Merge branch 'develop' -- see `CHANGELOG.md` for details.