Merge branch 'master' into self-hosted

04612d25d7Andrew Kelley committed on 12/6/2017, 7:58:24 PMparentsb66fb7c249cb2a
3 files changedLine totals unavailable