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