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