Manual merge of Harshit's !143

username-removed-56772 requested to merge warsaw/mailman:mr143 into master Apr 19, 2016