Merged v1.3.x-stage into v1.3.x v1.3.x
authorRISCi_ATOM <bob@bobcall.me>
Sat, 19 Dec 2015 22:54:33 +0000 (22:54 +0000)
committerRISCi_ATOM <bob@bobcall.me>
Sat, 19 Dec 2015 22:54:33 +0000 (22:54 +0000)

Trivial merge