Merge pull request #633 from mkurz/lighthouse-974-patch

[#974] String.format uses current locale for message formatting
Merge pull request #622 from mkurz/lighthouse-1500-patch

[#1500] attachDataSource functionality for Mailer