Merge branch 'mm/multimail-1.5'