# Conflicts:
#   server/lib/classes/letsencrypt.inc.php

Skip rendering and reloading bind if there are no records, fixes #6350

Closes #6350

See merge request !1611

Avoid syslog errors about MySQL/MariaDB "Aborted connections" due to cron script.

Closes #6380

See merge request !1628

Add useful default extensions to sieve require template.  See #6382

See merge request !1630

Replace gentoo.conf.php

See merge request !1631

Fix.

See merge request !1632

Add wildcard path option to IDS whitelist.

Closes #6395

See merge request !1639

Uninstall: Remove dangling symlink for PureFTPd cert which would otherwise prevent re-installation

Closes #6380

See merge request ispconfig/ispconfig3!1626

update german translation

Closes #6391

See merge request !1638

# Conflicts:
#   interface/web/login/index.php

Resolve "Port apps.vhost from install/ to server/"

Closes #6321

See merge request !1592

Merge branch '6314-only-add-mailman-related-config-to-the-postfix-config-if-mailman-is-installed' into 'develop'

Resolve "Only add Mailman related config to the Postfix config if Mailman is installed"

Closes #6314

See merge request !1633

Fixed issue #6389 mail server not configured correctly

Closes #6389

See merge request ispconfig/ispconfig3!1637

Add a default_country config option

Closes #4127

See merge request ispconfig/ispconfig3!1618

apps: Increase PHP post and upload limit to 100M.  See #6381

Closes #6381

See merge request ispconfig/ispconfig3!1629

Merge branch '6383-ah00548-namevirtualhost-has-no-effect-and-will-be-removed-in-the-next-release-etc-apache2' into 'develop'

Resolve "AH00548: NameVirtualHost has no effect and will be removed in the next release /etc/apache2/sites-enabled/000-ispconfig.vhost:7"

Closes #6383

See merge request ispconfig/ispconfig3!1634

Resolve "hide stderr from which(1) on centos"

Closes #6316

See merge request ispconfig/ispconfig3!1635

Rename Mailman data directory if it exists and Mailman is not installed to prevent broken routes (#6314)

Fix mailuser login, closes #6380

Closes #6380

See merge request ispconfig/ispconfig3!1627

Can set zero lenght password on constructor 

Set a default for newly created users to be active, fixes #6369

Closes #6369

See merge request ispconfig/ispconfig3!1620

Allows Apache2 + PHP-FPM to interpret PHP files in /var/www/example.com/web, #6335

Closes #6335

See merge request ispconfig/ispconfig3!1603

Add bind_keyfiles_dir config option

See merge request ispconfig/ispconfig3!1375

Patch taken from https://forum.howtoforge.com/threads/monitoring-mysql-mariadb-annoying-aborted-connection-on-var-log-mysql-error-log-hack.89045/