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