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