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