2015-07-28 - production
10:31	<paravoid>	merging a series of mail-related patches; ping me personally if problems arise	[production]