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