Merge proposals dependent on lp://qastaging/~benste/mailmanweb/django_dev_setup

lp://qastaging/~benste/mailmanweb/django_dev_setup has no merge proposals.