merged
mentioned in commit 3bf2faf0
This will create a new commit in order to revert the existing changes.