Merge branch 'v1.4' into v1.5
authorRISCi_ATOM <bob@bobcall.me>
Tue, 27 Feb 2018 05:17:30 +0000 (00:17 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Tue, 27 Feb 2018 05:17:30 +0000 (00:17 -0500)

Trivial merge