Merge branch 'v1.4' of https://gogs.librecmc.org/librecmc/librecmc into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Tue, 4 Sep 2018 18:22:53 +0000 (14:22 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Tue, 4 Sep 2018 18:22:53 +0000 (14:22 -0400)

Trivial merge