mail
Merge branch '4-0-stable' of https://github.com/woto/rails into 4-0-stable