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