sync with https://github.com/OpenRA/OpenRA/pull/6193