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