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

Conflicts:
	test/test_manifest.json

diff --cc pdf.js
Simple merge

diff --cc test/driver.js
Simple merge

diff --cc test/test_manifest.json
index 50f3c4c16a0157703c995f094d8cd628c56f5579,39d1f50ab21991b5fc6278423a3f092c5a5cc896..71738f1924e18e500be9712043dfc2ebd8e35d72
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -152,11 -152,10 +152,17 @@@
         "rounds": 1,
         "type": "load"
      },
+     {  "id": "extgstate",
+        "file": "pdfs/extgstate.pdf",
+        "link": false,
+        "rounds": 1,
+        "type": "load"
++    },
 +    {  "id": "ibwa-bad",
 +       "file": "pdfs/ibwa-bad.pdf",
 +       "link": true,
 +       "rounds": 1,
 +       "skipPages": [ 16 ],
 +       "type": "load"
      }
  ]