avoid in-building spawn
Merge branch 'master' of github.com:ushu/z-project
Merge branch 'master' of github.com:ushu/z-project