Sync with 0ad/master