Merge branch 'v1.4' into LTS
authorRISCi_ATOM <bob@bobcall.me>
Mon, 10 Jun 2019 23:11:04 +0000 (19:11 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 10 Jun 2019 23:11:04 +0000 (19:11 -0400)

Trivial merge