OpenRA/OpenRA — pull request #6044 by UberWaffe (2014-07-23 14:39:50+00:00)
Title: Regression and UpgradeRules fix for #5921.

Fixes the regression I caused in #5921.
Closes #6039.