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