Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

Conflicts:
	phpBB/config/services.yml

phpBB/phpbb/auth/provider/ldap.php

@@ -9,14 +9,6 @@
 
 namespace phpbb\auth\provider;
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
 /**
  * Database authentication provider for phpBB3
  *
@@ -106,7 +98,6 @@ class ldap extends \phpbb\auth\provider\base
 
 		@ldap_close($ldap);
 
-
 		if (!is_array($result) || sizeof($result) < 2)
 		{
 			return sprintf($this->user->lang['LDAP_NO_IDENTITY'], $this->user->data['username']);