Merge remote-tracking branch 'personal/v1.4.1' into v1.4.1
authorRISCi_ATOM <bob@bobcall.me>
Wed, 27 Sep 2017 15:59:09 +0000 (11:59 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Wed, 27 Sep 2017 15:59:09 +0000 (11:59 -0400)

Trivial merge