Merge pull request #4463 from lucize/dovecotup