Merge from OpenJK: 5f575c41c663e1f496073fcc19d54fd9dd699b51