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