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