Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/branch-and-deliver-to-any-2791-2

1. branch-and-deliver-to-any-2791-2
2. Dependent merge proposals