Upstream almost has this resolved. They just need to finish cleaning up the copyright headers to refer to dual-licensing. Once the next release (0.9.12) is done with this in it I'll check and upload the package. Regards, Daniel