Merge branch 'JohnathanFL-master'

closes #2900
closes #2894
158e2312eaAndrew Kelley committed on 7/16/2019, 5:14:11 PMparents15ed47923dd7f4
1 file changedLine totals unavailable