merging changes from Unvanquished engine