diff --git a/Classes/PluginBase/PluginBase.php b/Classes/PluginBase/PluginBase.php
index <HASH>..<HASH> 100644
--- a/Classes/PluginBase/PluginBase.php
+++ b/Classes/PluginBase/PluginBase.php
@@ -161,7 +161,7 @@ abstract class Tx_Solr_PluginBase_PluginBase extends tslib_pibase {
 	protected function initialize($configuration) {
 		$this->conf = $configuration;
 
-		$this->conf = array_merge(
+		$this->conf = t3lib_div::array_merge_recursive_overrule(
 			$GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_solr.'],
 			$this->conf
 		);
[BUGFIX] PluginBase: Allow overwriting parts of configuration

Base-configuration comes from TypoScript. Allow to explicitly
provide only those values you want to override and keep the
rest unchanged.

Change-Id: Ie2efb9f<I>e<I>de<I>e<I>d<I>b7f8f7da<I>e
Resolves: #<I>
Releases: <I>, <I>
Reviewed-on: <URL>