Merge proposals dependent on lp://qastaging/~armagetronad-dev/armagetronad/trunk-armagetronad-eevent

lp://qastaging/~armagetronad-dev/armagetronad/trunk-armagetronad-eevent has no merge proposals.