Merge branch 'alexnask-fix_6868' into master

Closes #7139
Closes #6868
57ac835a03Andrew Kelley committed on 12/1/2020, 1:13:06 AMparent3c907e5
3 files changedLine totals unavailable