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