Patch is now in master