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