Merge branch 'master' into master

data/conf/dovecot/dovecot.conf

@@ -58,6 +58,11 @@ passdb {
   result_failure = continue
   result_internalfail = continue
 }
+passdb {
+  driver = passwd-file
+  args = /usr/local/etc/dovecot/dovecot-master.passwd
+  skip = authenticated
+}
 # Set doveadm_password=your-secret-password in data/conf/dovecot/extra.conf (create if missing)
 service doveadm {
   inet_listener {
@@ -257,9 +262,14 @@ service lmtp {
 listen = *,[::]
 ssl_cert = </etc/ssl/mail/cert.pem
 ssl_key = </etc/ssl/mail/key.pem
+userdb {
+  driver = passwd-file
+  args = /usr/local/etc/dovecot/dovecot-master.userdb
+}
 userdb {
   args = /usr/local/etc/dovecot/sql/dovecot-dict-sql-userdb.conf
   driver = sql
+  skip = found
 }
 protocol imap {
   imap_metadata = yes
@@ -347,4 +357,4 @@ auth_cache_negative_ttl = 0
 auth_cache_ttl = 30 s
 auth_cache_size = 2 M
 !include_try /usr/local/etc/dovecot/extra.conf
-default_client_limit = 10240
+default_client_limit = 10400