Rebase from OpenRA/OpenRA/bleed