Merge branch 'v1.5' into LTS : v1.5.1-20200401
authorRISCi_ATOM <bob@bobcall.me>
Tue, 31 Mar 2020 14:41:02 +0000 (10:41 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Tue, 31 Mar 2020 14:41:02 +0000 (10:41 -0400)

Trivial merge