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