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