Merge branch 'newusers' of ssh://server/scm/spider into newusers