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

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