Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/windows-checkstatus-3004

lp://qastaging/~divmod-dev/divmod.org/windows-checkstatus-3004 has no merge proposals.