Merge branch 'v1.4' of systema/libreCMC into v1.4