Merge remote-tracking branch 'refs/remotes/origin/normal' into unstable

mark.py

@@ -702,7 +702,7 @@ def namumark(session, title, data):
                             none_this = False
                             break
                         else:
-                            i += 1
+                            i += 2
                     except:
                         none_this = True
                         break