fixups from rebase

acd8f6ef18Andrew Kelley committed on 4/8/2018, 10:49:20 PMparent8f4ad95
5 files changedLine totals unavailable