Merge branch 'master' of git+ssh://openadk.org/git/openadk