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