Merge https://github.com/EllisLab/CodeIgniter into valid-ipv6