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