Fix #3242
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop