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