Weird issue on Jon Hardison's site -- this should go into mainline development