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