I'll land it tonight provided @piscisaureus gets around to reviewing the Windows side of things.