Merge branch 'master' of ssh://dirk@server/scm/spider