Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

# Conflicts:
#	composer.json
#	css/light-grey.scss
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php

core/config.class.inc.php

@@ -232,6 +232,7 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
+		// Deprecated in 2.8.0 to be removed in 2.9
 		'skip_strong_security' => array(
 			'type' => 'bool',
 			'description' => 'Disable strong security - TEMPORARY: this flag should be removed when we are more confident in the recent change in security',
@@ -2401,4 +2402,4 @@ class ConfigPlaceholdersResolver
 		IssueLog::Error($sErrorMessage, self::class, array($sSourceName, $sKey, $sDefault, $sWholeMask));
 		throw new ConfigException($sErrorMessage);
 	}
-}
+}