chiark / gitweb /
merge changes and wip from --ubuntu branch