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