[ci skip] Merge branch '3.1-stable' into develop
[ci skip] Merge branch '3.1-stable' into develop

bcit-ci/CodeIgniter,madwings/InsaneDB,bcit-ci/CodeIgniter,bcit-ci/CodeIgniter,madwings/InsaneDB,madwings/InsaneDB,bcit-ci/CodeIgniter,bcit-ci/CodeIgniter,madwings/InsaneDB,madwings/InsaneDB