Merge branch '3.3.x'

Author: marc1706

db/migration/data/v30x/.htaccess renamed to db/migration/data/.htaccess

@@ -1,33 +1,25 @@
 # With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
 # module mod_authz_host to a new module called mod_access_compat (which may be
-# disabled) and a new "Require" syntax has been introduced to mod_authz_host.
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
 # We could just conditionally provide both versions, but unfortunately Apache
 # does not explicitly tell us its version if the module mod_version is not
 # available. In this case, we check for the availability of module
 # mod_authz_core (which should be on 2.4 or higher only) as a best guess.
 <IfModule mod_version.c>
 	<IfVersion < 2.4>
-		<Files "*">
-			Order Allow,Deny
-			Deny from All
-		</Files>
+		Order Allow,Deny
+		Deny from All
 	</IfVersion>
 	<IfVersion >= 2.4>
-		<Files "*">
-			Require all denied
-		</Files>
+		Require all denied
 	</IfVersion>
 </IfModule>
 <IfModule !mod_version.c>
 	<IfModule !mod_authz_core.c>
-		<Files "*">
-			Order Allow,Deny
-			Deny from All
-		</Files>
+		Order Allow,Deny
+		Deny from All
 	</IfModule>
 	<IfModule mod_authz_core.c>
-		<Files "*">
-			Require all denied
-		</Files>
+		Require all denied
 	</IfModule>
 </IfModule>