Sync with CodeIgniter v2.2.0.

Almost the same actually.