lisp-team branch merged into master at
b6b439c24314580f27e14d62022d5a8b2083f757.