update changelog
fix #3488 (mostly)
Merge branch 'release' into develop