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