Merge branch 'alexnask-fix_6868' into master

Closes #7139
Closes #6868
c55984b58fAndrew Kelley committed on 12/1/2020, 1:12:07 AMparents8c9919e9d18161
3 files changedLine totals unavailable