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