Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/urchin-ssl-2479

lp://qastaging/~divmod-dev/divmod.org/urchin-ssl-2479 has no merge proposals.