Merge upstream and change test pdf file.

diff --cc Makefile
Simple merge

diff --cc src/core.js
Simple merge

diff --cc src/evaluator.js
Simple merge

diff --cc test/pdfs/.gitignore
index 854612f83daca0b2e56eace6dfbcb317ac675e28,ac3dabb7036845840d4ce5b75866041ab9b492ab..a757acf3453e8941602337cd863f660a7b0326f8
--- 1/test/pdfs/.gitignore
--- 2/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -14,4 -14,5 +14,5 @@@
  !sizes.pdf
  !close-path-bug.pdf
  !alphatrans.pdf
 -
+ !devicen.pdf
 +!cmykjpeg.pdf

diff --cc test/pdfs/cmykjpeg.pdf
index 2f35ef763824b72d78054d53974eecabd87d5981,0000000000000000000000000000000000000000..8e3b85a06118ff855bdb9a66296d6fc08836f996
mode 100644,000000..100644
Binary files differ

diff --cc test/test_manifest.json
index 583e1cbaa9c74f60bb865d0bb29a95b655d4998b,ee6e04604c3aaa89c3f6dfd3c6cd892dbcd09fcb..87af306596de6b87f1d5939da856b897c2951f48
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -19,7 -19,7 +19,8 @@@
      },
      {  "id": "intelisa-load",
         "file": "pdfs/intelisa.pdf",
+        "md5": "f5712097d29287a97f1278839814f682",
 +       "md5": "f3ed5487d1afa34d8b77c0c734a95c79",
         "link": true,
         "rounds": 1,
         "type": "load"
@@@ -262,11 -269,11 +263,18 @@@
         "rounds": 1,
         "type": "eq"
      },
-        "md5": "8307472972ba962d86d2f60d2ced9a97",
+     {  "id": "devicen",
+        "file": "pdfs/devicen.pdf",
+        "md5": "aac6a91725435d1376c6ff492dc5cb75",
+        "link": false,
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "cmykjpeg",
 +       "file": "pdfs/cmykjpeg.pdf",
++       "md5": "85d162b48ce98503a382d96f574f70a2",
 +       "link": false,
 +       "rounds": 1,
 +       "type": "eq"
      }
  ]