update to master

diff --cc pdf.js
Simple merge

diff --cc test/test_manifest.json
index 5c1802debd93f92655511fee64d9aeaab08a5ed4,231857fa88154599d0d141667f1e37516ed8da9b..39d1f50ab21991b5fc6278423a3f092c5a5cc896
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -146,10 -146,10 +146,16 @@@
         "rounds": 1,
         "type": "load"
      },
+     {  "id": "hudsonsurvey",
+        "file": "pdfs/hudsonsurvey.pdf",
+        "link": true,
+        "rounds": 1,
+        "type": "load"
++    },
 +    {  "id": "extgstate",
 +       "file": "pdfs/extgstate.pdf",
 +       "link": false,
 +       "rounds": 1,
 +       "type": "load"
      }
  ]