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