Following upstream master

[illwieckz]

This repository is currently 1 commit ahead of upstream (and many commits behind).

The ahead commit is this one: 2f609aa

This commit had been merged upstream: mikke89@c71a1b1

Can we simply remove this commit from our master and merge upstream? @slipher

[slipher]

The situation is described in the Unvanquished/Unvanquished#1715 OP

[illwieckz]

Thanks, best summary may be there: Unvanquished/Unvanquished#1200 (comment)

Note that we are using a pretty old version of RmlUI now, from March 2020. I don't want to update right away because they completely changed the source layout again.

[illwieckz]

We still use one remaining specific commit: cf67dbd