Merge branch 'v1.5' into LTS with v1.5.0a changes.
authorRISCi_ATOM <bob@bobcall.me>
Sun, 2 Feb 2020 00:54:18 +0000 (19:54 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Sun, 2 Feb 2020 00:54:18 +0000 (19:54 -0500)

Trivial merge