Merge branch 'master' of ldpinney/GnuBee-libreCMC into master