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