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