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