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