ldap change
Merge branch '1.0.7' of https://github.com/DeegC/zeidon-joe into 1.0.7