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