Merge branch 'master' of git+ssh://ln.pjr.cc/glcas