Merge upstream.

diff --cc src/evaluator.js
Simple merge

diff --cc test/pdfs/.gitignore
Simple merge

diff --cc test/test_manifest.json
index a1f32a5cd45248d4434041a32fb430774fbbc635,f3c045ccf95a79af6549c4fa1610e5f366ddda13..59f1339aa5669879acdd19fcb7667e2dd459f9ac
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -472,12 -472,14 +472,20 @@@
        "rounds": 1,
        "type": "eq"
      },
+     {  "id": "tamreview",
+       "file": "pdfs/TAMReview.pdf",
+       "md5": "8039aba56790d3597d2bc8c794a51301",
+       "rounds": 1,
+       "pageLimit": 5,
+       "link": true,
+       "type": "eq"
+     },
 +    {  "id": "issue1350",
 +      "file": "pdfs/issue1350.pdf",
 +      "md5": "92f72a04a4d9d05b2dd433b51f32ab1f",
 +      "rounds": 1,
 +      "type": "eq"
 +    },
      {  "id": "issue925",
        "file": "pdfs/issue925.pdf",
        "md5": "f58fe943090aff89dcc8e771bc0db4c2",