Merge branches 'mojo' and 'test' of ssh://server/scm/spider into test