Merge branch 'v1.4'
authorRISCi_ATOM <bob@bobcall.me>
Mon, 1 Jan 2018 16:39:30 +0000 (11:39 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 1 Jan 2018 16:39:30 +0000 (11:39 -0500)

Trivial merge