Merge branch 'v1.5' into LTS : v1.5.2 v1.5.2
authorRISCi_ATOM <bob@bobcall.me>
Mon, 29 Jun 2020 17:00:05 +0000 (13:00 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 29 Jun 2020 17:00:05 +0000 (13:00 -0400)

Trivial merge