Remove a few merged versionadded/changed.
6 files changed