Merge branch '3.1-stable' into develop

Conflicts resolved:
	system/core/CodeIgniter.php
	tests/codeigniter/libraries/Form_validation_test.php
	user_guide_src/source/changelog.rst
	user_guide_src/source/conf.py
	user_guide_src/source/installation/downloads.rst
	user_guide_src/source/installation/upgrading.rst

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php
index 035410724..ab0e1fc0a 100644
--- a/tests/codeigniter/libraries/Form_validation_test.php
+++ b/tests/codeigniter/libraries/Form_validation_test.php
@@ -268,6 +268,7 @@ class Form_validation_test extends CI_TestCase {
 	public function test_rule_valid_email()
 	{
 		$this->assertTrue($this->form_validation->valid_email('email@sample.com'));
+		$this->assertFalse($this->form_validation->valid_email('email@sample.com foo bar'));
 		$this->assertFalse($this->form_validation->valid_email('valid_email', '@sample.com'));
 	}