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