Merge branch 'master' of https://github.com/andreasgal/pdf.js.git into charstoglyphs

Conflicts:
	test/test_manifest.json

diff --cc pdf.js
Simple merge

diff --cc test/test_manifest.json
index 7893faa187583f2b2821b940fd8217901d551d7f,3734ee9e4c33ccb5005ecdc3e87fe25b0b56977a..9dda577604e12fc8885b7ab76db74db44a6931d3
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -110,10 -110,10 +110,16 @@@
         "rounds": 1,
         "type": "eq"
      },
+     {  "id": "artofwar",
+        "file": "pdfs/artofwar.pdf",
+        "link": true,
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "fips197",
 +       "file": "pdfs/fips197.pdf",
 +       "link": true,
 +       "rounds": 1,
 +       "type": "load"
      }
  ]