Merge pull request #5551
dd3f697 Use real text rather than image-rendered text for unit selector (Luke Dashjr)