merged
mentioned in commit 26506a75
mentioned in commit 14f5373d
This will create a new commit in order to revert the existing changes.