Sync upstream (3.2)

Author: octoberapp

.htaccess

@@ -18,6 +18,11 @@
     # RewriteCond %{HTTPS} off
     # RewriteRule (.*) https://%{SERVER_NAME}/$1 [L,R=301]
 
+    ##
+    ## Uncomment to redirect index.php/path/to/page to /path/to/page
+    ##
+    # RewriteRule ^index\.php/(.*)$ /$1 [L,R=301]
+
     ##
     ## Blocked folders
     ##