Looks like unrelated commits got into this changelog.  I really think it would be better to purge them, bump to release 2 and re-tag with --keep-version.

After the changelog is fixed, merge on.