Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop