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