Merge branch 'master' into bug/no-line-numbers-without-jumptoline

This commit is contained in:
Kyle Shockey
2017-04-05 15:50:55 -07:00
10 changed files with 32 additions and 21 deletions

File diff suppressed because one or more lines are too long