Merge branch 'master' of https://github.com/dae/anki

anki/collection.py

@@ -700,6 +700,7 @@ select id from notes where mid not in """ + ids2str(self.models.ids()))
                 if t['did'] == "None":
                     t['did'] = None
                     problems.append(_("Fixed AnkiDroid deck override bug."))
+                    self.models.save(m)
             if m['type'] == MODEL_STD:
                 # model with missing req specification
                 if 'req' not in m:

aqt/utils.py

@@ -331,6 +331,10 @@ def mungeQA(col, txt):
     txt = stripSounds(txt)
     # osx webkit doesn't understand font weight 600
     txt = re.sub("font-weight: *600", "font-weight:bold", txt)
+    if isMac:
+        # custom fonts cause crashes on osx at the moment
+        txt = txt.replace("font-face", "invalid")
+
     return txt
 
 def applyStyles(widget):