I don't even... merge/conflict failed here, sorry.
Q_StripColor patch from Didz
Also strip ^8 and ^9 with Q_StripColor
Revert ioq3 change that prevents using the caps/num/scroll lock keys as binds