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