Patch applied on the lisp-team branch as
154bb7140f77d528253e6363db14524eadd26a67.
Thanks.