Version and release notes updated
Fixes #1646
Fixes #1655