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