Fix for 5.3
Merge branch 'master' of github.com:stijnkoopal/zf2-mail