This was causing issues in PHP 5.5

This is a known issue in codeigniter and I applied the patch they accepted (or.. has been sitting there waiting to be accepted).
Merge branch 'refs/heads/2.3/develop' into 3.0/develop