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