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