Merge commit '2ec8e2c2ac' into scripting

Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/p_local.h

(Had to merge this all by itself because it was creating too many merge conflicts when combined with other stuff.

src/d_main.cpp

@@ -2443,6 +2443,7 @@ void D_DoomMain (void)
 
 		InitActorNumsFromMapinfo();
 		PClassActor::StaticSetActorNums ();
+		InitSpawnablesFromMapinfo();
 		//Added by MC:
 		bglobal.getspawned.Clear();
 		argcount = Args->CheckParmList("-bots", &args);