Merge branch 'v1.4' of https://gogs.librecmc.org/libreCMC/libreCMC into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Tue, 23 Jan 2018 00:25:31 +0000 (19:25 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Tue, 23 Jan 2018 00:25:31 +0000 (19:25 -0500)

Trivial merge