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