Merge production ready CodeIgniter branch into master