Merge branch 'v1.4' into v1.5
authorRISCi_ATOM <bob@bobcall.me>
Thu, 12 Apr 2018 18:51:21 +0000 (14:51 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Thu, 12 Apr 2018 18:51:21 +0000 (14:51 -0400)

Trivial merge