Merge branch '3.6' into 3

cache/Cache.php

@@ -174,7 +174,9 @@ class SS_Cache {
 
 		$backend = self::$backends[$backend_name];
 
-		$basicOptions = array('cache_id_prefix' => $for);
+		$basicOptions = array(
+		    'cache_id_prefix' => md5(BASE_PATH) . '_' . $for . '_',
+        );
 
 		if ($cache_lifetime >= 0) {
 			$basicOptions['lifetime'] = $cache_lifetime;

core/manifest/ConfigManifest.php

@@ -115,7 +115,8 @@ class SS_ConfigManifest {
 	{
 		return SS_Cache::factory('SS_Configuration', 'Core', array(
 			'automatic_serialization' => true,
-			'lifetime' => null
+			'lifetime' => null,
+			'cache_id_prefix' => 'SS_Configuration_',
 		));
 	}