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