Merge branch 'master' into dev2019

Author: TimidRobot

config/livelicenses/000-default.conf

@@ -200,8 +200,12 @@
     # Address https://github.com/creativecommons/creativecommons.org/issues/563
     RewriteRule ^/publicdomain/zero/1.0/deed.en/$ https://creativecommons.org/publicdomain/zero/1.0/deed.en [L,R=301]
 
+    # Resolve https://github.com/creativecommons/tech-support/issues/359
+    RewriteRule ^/publicdomain/mark/1.0/index.php https://creativecommons.org/publicdomain/mark/1.0/ [L,R=301]
+    RewriteRule ^/publicdomain/zero/1.0/index.php https://creativecommons.org/publicdomain/zero/1.0/ [L,R=301]
+
     # Legalcode rewrites
-        # FIXME: eval whether we should use the LHS as the actual file structure so we don't need the rewrites
+    # FIXME: eval whether we should use the LHS as the actual file structure so we don't need the rewrites
     RewriteRule ^/legalcode http://creativecommons.org/ [L,R=301]
     RewriteRule .*legalcode/$ http://creativecommons.org/ [L,R=301]
     RewriteRule ^/licenses/(.*)sampling\+/1.0/(.*)/legalcode$ /legalcode/$1samplingplus_1.0_$2.html [L]