Merge remote branch 'upstream/master' into metrics

diff --cc fonts.js
index beecf045981912583d5aac2d1a573d08aa1bc1a7,7d51e2c4b2acddf272cca0f70be6a6c47c6fefa9..aae775dc3b568b3dec163b642eecc4538a655473
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js
@@@ -2601,10 -2571,10 +2606,10 @@@ var Type2CFF = (function() 
          } else if (value <= 254) {
            return -((value - 251) * 256) - dict[pos++] - 108;
          } else {
 -          error('Incorrect byte');
 +          error('255 is not a valid DICT command');
          }
          return -1;
-       };
+       }
  
        function parseFloatOperand() {
          var str = '';

diff --cc pdf.js
Simple merge

diff --cc utils/cffStandardStrings.js
Simple merge

diff --cc utils/fonts_utils.js
Simple merge