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