Merge pull request #3461 from Shulyaka/mailman