Merge branch 'v1.5' into LTS : 20200122
authorRISCi_ATOM <bob@bobcall.me>
Wed, 22 Jan 2020 14:44:30 +0000 (09:44 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Wed, 22 Jan 2020 14:44:30 +0000 (09:44 -0500)

Trivial merge