Merge branch 'jc/read-tree-empty-with-m' into maint