Spawner should be finished now, in theory
Merge remote-tracking branch 'origin/master'