Fix issues #2160, #2161
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop