Second v1.3.4-dev merge.
authorRISCi_ATOM <bob@bobcall.me>
Mon, 30 May 2016 17:52:36 +0000 (17:52 +0000)
committerRISCi_ATOM <bob@bobcall.me>
Mon, 30 May 2016 17:52:36 +0000 (17:52 +0000)

Trivial merge