Merge in upstream changes from CodeIgniter development branch.
Merge pull request #177 from nealpoole/master

Merge in upstream changes from CodeIgniter development branch.