Merge branch 'master' of git://github.com/mozilla/pdf.js.git into jpx6

Conflicts:
	test/test_manifest.json

diff --cc test/test_manifest.json
index 2110ea52e32c10fadce8a45cb22f57d340de0c25,6d04597d8ff457a4dc999e62cc1d13951f7b6c22..fce77e0b2047264e105cf0eaf7b288b9455cf1a3
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -411,10 -411,11 +411,17 @@@
        "link": true,
        "type": "load"
      },
 +    {  "id": "S2-eq",
 +       "file": "pdfs/S2.pdf",
 +       "md5": "d0b6137846df6e0fe058f234a87fb588",
 +       "rounds": 1,
 +       "type": "eq"
++    },
+     {  "id": "issue1055",
+       "file": "pdfs/issue1055.pdf",
+       "md5": "3ba56c2e48dce81da8669b1b9cf98ff0",
+       "rounds": 1,
+       "link": true,
+       "type": "eq"
      }
  ]