Requires full testing once comm_spawn is fixed (Edgar is working that now). This commit was SVN r21664.