Revert "Merge fix"
This reverts commit eb9da542b5ce9e7afc861574aa6e640d1821377f.
Please DO NOT make such cosmetic changelog tweaks in the future (at least not in
MY packages)! They break fast-forward merges for no good reason (and after
fixing it, the history becomes dirty). The extra changelog entry does not hurt
anybody. Just fast-forward-merge master to all branches no matter what the
changelog says.