Patch applied on the lisp-team branch as
4440ba3f6ee1f6936755b2eb1e9d60108d2f9c72.
Thanks.