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