Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements