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