merging patches
merging changes from Unvanquished engine