Merge branch 'develop' into '5767-installer-does-not-issue-le-certificate'
# Conflicts: # install/install.php # install/lib/installer_base.lib.php # install/update.php
# Conflicts: # install/install.php # install/lib/installer_base.lib.php # install/update.php