Update
-----

Patch accepted, so this is now purely archival material.