Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Merge branch 'develop' of github.com:cickes/CodeIgniter into develop