Add Changelog entry for pull requests #297 and #299