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

3 files changed, 26 insertions, 11 deletions

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 18a973ac5..e52571f9d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -131,10 +131,25 @@ Release Date: Not Released
 Version 3.1.10
 ==============
 
+-  General Changes
+
+   -  Added 'ssl_verify' support to the 'pdo/mysql' :doc:`Database <database/index> driver.
+
 Bug fixes for 3.1.10
 --------------------
 
 -  Fixed a bug (#5526) - :doc:`Session Library <libraries/sessions>` had a syntax error in its 'memcached' driver.
+-  Fixed a bug (#5542) - :doc:`Database Forge <database/forge>` method ``modify_column()`` always made fields ``NOT NULL`` when attempting to modify their nullable property under PostgreSQL.
+-  Fixed a bug (#5561) - :doc:`Database Library <database/index>` didn't allow SSL connection configuration with only the 'ssl_verify' option when using the 'mysqli' driver.
+-  Fixed a bug (#5545) - :doc:`Session Library <libraries/sessions>` crashed due to a caching-related error with the 'files' driver.
+-  Fixed a bug (#5571) - :doc:`XML-RPC Library <libraries/xmlrpc>` had a typo that triggered an ``E_WARNING`` message on PHP 7.2.
+-  Fixed a bug (#5587) - :doc:`Database Forge <database/forge>` method ``create_table()`` generated an ``E_WARNING`` message.
+-  Fixed a bug (#5590) - :doc:`Form Validation Library <libraries/form_validation>` rule **valid_base64** didn't have a default error message.
+-  Fixed a bug (#5624) - :doc:`Database Library <database/index>` methods ``list_fields()``, ``field_exists()`` returned incorrect results after tables are modified.
+-  Fixed a bug (#5627) - :doc:`Database <database/index>` driver 'mysqli' triggered an ``E_WARNING`` message if there's no ``'port'`` specified in the database configuration.
+-  Fixed a bug (#5651) - :doc:`Database Caching <database/caching>` could try to delete non-existent cache files due to a race condition.
+-  Fixed a bug (#5652) - :doc:`CAPTCHA Helper <helpers/captcha_helper>` function :php:func:`create_captcha()` didn't comply with CSS standards.
+-  Fixed a bug (#5605) - :doc:`Form Validation Library <libraries/form_validation>` didn't nullify array inputs that are expected to be strings.
 
 Version 3.1.9
 =============
diff --git a/user_guide_src/source/installation/upgrade_3110.rst b/user_guide_src/source/installation/upgrade_3110.rst
index a19f1e68e..0e3b7c676 100644
--- a/user_guide_src/source/installation/upgrade_3110.rst
+++ b/user_guide_src/source/installation/upgrade_3110.rst
@@ -12,3 +12,14 @@ Replace all files and directories in your *system/* directory.
 
 .. note:: If you have any custom developed files in these directories,
 	please make copies of them first.
+
+Step 2: Check for calls to is_countable()
+==========================================
+
+
+PHP 7.3 introduces a native `is_countable() <https://secure.php.net/is_countable>`_
+function, which creates a name collision with the ``is_countable()`` function
+we've had in our :doc:`Inflector Helpers <../helpers/inflector_helper>`.
+
+If you've been using the helper function in question, you should now rename
+the calls to it to :php:func:`word_is_countable()`.
diff --git a/user_guide_src/source/installation/upgrade_320.rst b/user_guide_src/source/installation/upgrade_320.rst
index a9dc274c7..3eadd8caf 100644
--- a/user_guide_src/source/installation/upgrade_320.rst
+++ b/user_guide_src/source/installation/upgrade_320.rst
@@ -257,14 +257,3 @@ so that if you're using the :doc:`Web Page Caching <../general/caching>`
 feature, you'll be left with some old, garbage cache files.
 
 That shouldn't be a problem, but you may want to clear them.
-
-Step 13: Check for calls to is_countable()
-==========================================
-
-
-PHP 7.3 introduces a native `is_countable() <https://secure.php.net/is_countable>`_
-function, which creates a name collision with the ``is_countable()`` function
-we've had in our :doc:`Inflector Helpers <../helpers/inflector_helper>`.
-
-If you've been using the helper function in question, you should now rename
-the calls to it to :php:func:`word_is_countable()`.