Merge branch 'v1.5' of pi31415/libreCMC-cmh into v1.5