Merge v1.4 branch
authorRISCi_ATOM <bob@bobcall.me>
Fri, 9 Feb 2018 12:35:15 +0000 (07:35 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Fri, 9 Feb 2018 12:35:15 +0000 (07:35 -0500)

Trivial merge