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