This has now been merged.