fixups from the merge

7f6e97cb26Andrew Kelley committed on 8/2/2018, 9:36:08 PMparent65140b2
4 files changedLine totals unavailable