2.1 stable

Sync with EllisLab/CodeIgniter 2.1-stable