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