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