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