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