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