forgot a changelog entry
Merge branch 'release' into develop