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