Merge branch 'mw/sendemail'