Merge branch 'ioq3-for-urbanterror-41'