Merge remote branch 'upstream/master'

diff --cc fonts.js
Simple merge

diff --cc pdf.js
index 32e13817f53fc4a7c56b65a46104f0d0991b2efc,201744efecac38ee1573d95ac132f1543309dea1..597e8b23f2701d1d269cb0c4e78fde87d9b8819a
--- 1/pdf.js
--- 2/pdf.js
+++ b/pdf.js
@@@ -4379,9 -4396,10 +4379,9 @@@ var PartialEvaluator = (function() 
        }
  
        var descriptor = xref.fetch(fd);
 -
        var fontName = fontDict.get('Name');
        if (!fontName)
-         fontName = xref.fetchIfRef(descriptor.get('FontName'));;
+         fontName = xref.fetchIfRef(descriptor.get('FontName'));
        assertWellFormed(IsName(fontName), 'invalid font name');
        fontName = fontName.name.replace(/[\+,\-]/g, '_');