- nginx: merge function: default action is now to replace older locations in the nginx vhost configuration; a merge  instead of a replacement can be achieved by putting the string "##merge##" (without quotes) at the end of the most recent location line (e.g. "location ~ \.php$ { ##merge##").

- Added PHP-FPM pm settings (pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers) to the "Options" tab of a website.

- Installer adds ispconfig user to Apache group on Fedora/CentOS so that nginx/PHP-FPM can access /etc/squirrelmail and serve SquirrelMail for the ISPConfig vhost.
- Added session.save_path and upload_tmp_dir settings to the PHP-FPM pool definitions.

- Enabled Security Level (Server Config > Web > Security Level) for nginx.

- Added escapeshellcmd to some paths in nginx_plugin.inc.php.

- Added SEO redirects (both Apache & nginx) to redirect from non-www website to www website or vice versa.
- Introduced placeholder [scheme] for redirect paths for alias and subdomains; will be replaced with http or https, depending on what the visitor uses.

Custom php.ini settings: PHP-FPM might complain about invalid boolean value if you use 0 instead of off, false, or no.

- Fixed FS#1745.

http://lathama.net/Recursively_deleting_Microsoft_end_of_line_characters

- Added UFW firewall support.