Merge branch 'jc/status-show-ignored'