Merge pull request #6825 from annando/empty-spawn