Merge branch 'km/send-email-remove-cruft-in-address'