chiark / gitweb /
merge changes from --main branch, which aren't harmful atm