Merge /scm/spider into SIMPLEROUTE