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