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