Merge branch 'lv/status-say-working-tree-not-directory' into maint