Merge branch 'CDE' of github.com:laurencelundblade/QCBOR into CDE