Merge branch develop of github.com:/EllisLab/CodeIgniter into session