Applied 03965b6736 to JKA SP.
Merge branch 'master' of https://github.com/Razish/OpenJK
Applied 7853502a8a to JKA SP.
Applied the fixes from d95d9a4 to JKA SP as well.