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