8d2e981009
Done as vendor import as I hope the author will accept this patch, and I'm not ready to take this thing off the vendor branch yet.