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