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