Merge branch '3.1/develop' into 3.2/develop

Author: cbandy

classes/kohana/database.php

@@ -113,6 +113,11 @@ protected function __construct($name, array $config)
 		// Store the config locally
 		$this->_config = $config;
 
+		if (empty($this->_config['table_prefix']))
+		{
+			$this->_config['table_prefix'] = '';
+		}
+
 		// Store the database instance
 		Database::$instances[$name] = $this;
 	}