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