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