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