Merge branch 'patch-1' of github.com:w0den/CodeIgniter into feature/output_cache