Merge branch 'jc/diff-tree-stale-comment' into maint