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