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