Merge pull request #1281 from Araq/new_spawn

New spawn
Fix bootstrapping