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