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