Merge branch 'mojo' of /scm/spider into mojo