Fix directory results broken in CodeIgniter upgrade
Merge branch 'ucsf/develop' into ucsf/master