Bump version for 2.3.1
Fix invalid Markdown in CHANGELOG
Merge branch 'release/2.3.1' into develop