Updating CodeIgniter.
Merge branch 'master' into feature/phpmailer