Merge branch 'master' of git://github.com/mozilla/pdf.js.git into tree-53

Conflicts:
	test/test_manifest.json

diff --cc test/test_manifest.json
index fd2eb1e586c09a3f4a13b1d272d397210c029d25,684f7aa2dd1fadc5f13096f91c94857409a00b62..7954aa09417dc6f7ee11171421dca1e104cbdf99
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -382,11 -382,11 +382,18 @@@
        "rounds": 1,
        "type": "eq"
      },
 +    {  "id": "ocs",
 +      "file": "pdfs/ocs.pdf",
 +      "md5": "2ade57e954ae7632749cf328daeaa7a8",
 +      "rounds": 1,
 +      "link": true,
 +      "type": "load"
++    },
+     {  "id": "issue1015",
+       "file": "pdfs/issue1015.pdf",
+       "md5": "b61503d1b445742b665212866afb60e2",
+       "rounds": 1,
+       "link": true,
+       "type": "eq"
      }
  ]