Some fixes to make travis build
Merge branch 'master' of https://github.com/Spantree/phpldapadmin