Merge branch 'master' into Mario/ext_entityparam

diff --cc csprogs.c
index 13c27ec3992d9d3ebbadd531b8047b9daf77c7b2,c0c4eb42ff7d63df2f31cad2d17a7a6c5fc9f41d..6d83a7849d7951c27f00bc02804c3a63cb93acc2
--- 1/csprogs.c
--- 2/csprogs.c
+++ b/csprogs.c
@@@ -522,9 -517,7 +524,9 @@@ qboolean CL_VM_ConsoleCommand (hook_val
                PRVM_clientglobalfloat(time) = cl.time;
                PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
                restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
-               PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, cmd);
+               PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, arg->str);
 +              // optional entity parameter for self (EXT_ENTITYPARAM)
 +              PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity];
                prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing");
                prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
                r = CSQC_RETURNVAL != 0;

diff --cc host.c
Simple merge