set php_mail as default
Merge origin/master