lisp-team branch merged into master as
24f000a49a00b8dd3e9f51e08f0ef5567edf04aa.