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