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