Merge proposals dependent on lp://staging/~thomnico/orange-box/bug-fixes

lp://staging/~thomnico/orange-box/bug-fixes has no merge proposals.