Merge branch 'AdamGoertz-master'

closes #5080
closes #6887
1295525a7aAndrew Kelley committed on 1/11/2021, 2:04:22 AMparentse1d8073169810b
1 file changedLine totals unavailable