Merge branch 'master' of github.com:adamdunkley/logmailer