incorporated the LDAP auth patch from v2.1.1
incorporated the LDAP auth patch from v2.1.1

Trott/ilios,ilios/ilios,dartajax/ilios,ilios/ilios,dartajax/ilios,Trott/ilios,justinchu17/ilios,justinchu17/ilios,thecoolestguy/ilios,stopfstedt/ilios,stopfstedt/ilios,thecoolestguy/ilios,justinchu17/ilios,justinchu17/ilios