Pull in most updated version from swax/Quakespasm-Rift