hashes in curly braces
Merge branch 'add_ldap_supprt' into ail_prep