Merge branch 'v1.5' into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Sun, 26 Aug 2018 23:51:30 +0000 (19:51 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Sun, 26 Aug 2018 23:51:30 +0000 (19:51 -0400)

Trivial merge