Patch applied on the lisp-team branch as
466975efea86727465f75a4e2c54e9eeb212f4a6.
Thanks.