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