Merge branch 'cth' of ssh://git.carlh.net/home/carl/git/asdcplib-cth into cth