Mail ignores invalid from address
Merge origin/master