Merge branch '3.1-stable' into develop

Conflicts resolved:
	system/database/drivers/sqlite/sqlite_driver.php
	system/database/drivers/sqlite/sqlite_forge.php
	system/database/drivers/sqlite/sqlite_result.php
	system/database/drivers/sqlite/sqlite_utility.php
	system/helpers/captcha_helper.php
	system/helpers/email_helper.php
	system/helpers/inflector_helper.php
	system/helpers/smiley_helper.php
	system/language/english/form_validation_lang.php
	system/libraries/Cart.php
	system/libraries/Form_validation.php
	system/libraries/Javascript.php
	system/libraries/Javascript/Jquery.php
	system/libraries/Session/SessionHandlerInterface.php
	tests/codeigniter/helpers/inflector_helper_test.php
	user_guide_src/source/helpers/inflector_helper.rst

1 files changed, 1 insertions, 0 deletions

diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php
index e7215a066..74a2512c4 100644
--- a/system/language/english/form_validation_lang.php
+++ b/system/language/english/form_validation_lang.php
@@ -44,6 +44,7 @@ $lang['form_validation_valid_emails']		= 'The {field} field must contain all val
 $lang['form_validation_valid_url']		= 'The {field} field must contain a valid URL.';
 $lang['form_validation_valid_ip']		= 'The {field} field must contain a valid IP.';
 $lang['form_validation_valid_mac']		= 'The {field} field must contain a valid MAC.';
+$lang['form_validation_valid_base64']		= 'The {field} field must contain a valid Base64 string.';
 $lang['form_validation_min_length']		= 'The {field} field must be at least {param} characters in length.';
 $lang['form_validation_max_length']		= 'The {field} field cannot exceed {param} characters in length.';
 $lang['form_validation_exact_length']		= 'The {field} field must be exactly {param} characters in length.';