Merge EllisLab/CodeIgniter