Merge branch '4.x' into 5.x

Author: brandonkelly

web/.htaccess

@@ -1,9 +1,9 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
 
-    # Send would-be 404 requests to Craft
+    # Route 404s to index.php
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_URI} !^/(favicon\.ico|apple-touch-icon.*\.png)$ [NC]
-    RewriteRule (.+) index.php?p=$1 [QSA,L]
+    RewriteRule (.+) index.php [L]
 </IfModule>