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