Merge branch 'jc/maint-ls-tree' into maint