Merge pull request #4129 from lucize/dovecotdeps