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