Merge branch 'master' into self-hosted

18cf256817Andrew Kelley committed on 12/8/2017, 9:39:00 PMparents0dd3bbf3577a80
5 files changedLine totals unavailable