Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/dns-892-2

lp://qastaging/~divmod-dev/divmod.org/dns-892-2 has no merge proposals.