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