Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status