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