spider to consolidate fix
Merge branch 'master' of https://github.com/eisq/scpm into production