Merge pull request #2731 from josephok/develop

Update CodeIgniter.php