Merge branch 'master' of chiark:src/checkpath