[Merge] lp:~mgill25/mailman/branch2 into lp:mailman