Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/bzr.trunk

lp://qastaging/~divmod-dev/divmod.org/bzr.trunk has no merge proposals.