Fix for issue #469 to make LMTP delivery work with [as user]
Merge branch 'master' into portable