Make sure ldap_only conf parameter is passed to login template
Merge remote-tracking branch 'origin/master' into daily_totals