Merge in KMQuake II Update 6 changes