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