2.1 stable

Merge EllisLab/CodeIgniter