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