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