Patch merged into the dev branch.