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