Merge branch 'v1.4' of https://gogs.librecmc.org/libreCMC/libreCMC into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Sat, 30 Dec 2017 17:30:29 +0000 (12:30 -0500)
committerRISCi_ATOM <bob@bobcall.me>
Sat, 30 Dec 2017 17:30:29 +0000 (12:30 -0500)

Trivial merge