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