Merge branch 'refs/heads/master' into issue-1049

Conflicts:
	src/canvas.js

test/pdfs/.gitignore

@@ -22,4 +22,5 @@
 !issue918.pdf
 !smaskdim.pdf
 !type4psfunc.pdf
+!S2.pdf
 !zerowidthline.pdf

test/pdfs/issue1096.pdf.link

@@ -0,0 +1 @@
+http://www.faithaliveresources.org/Content/Site135/FilesSamples/105315400440pdf_00000009843.pdf

test/test_manifest.json

@@ -402,6 +402,14 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "issue1096",
+      "file": "pdfs/issue1096.pdf",
+      "md5": "7f75d2b4b93c78d401ff39e8c1b00612",
+      "rounds": 1,
+      "pageLimit": 10,
+      "link": true,
+      "type": "eq"
+    },
     {  "id": "liveprogramming",
       "file": "pdfs/liveprogramming.pdf",
       "md5": "7bd4dad1188232ef597d36fd72c33e52",
@@ -410,6 +418,12 @@
       "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",

test/test_slave.html

@@ -22,6 +22,7 @@
     <script type="text/javascript" src="/src/stream.js"></script>
     <script type="text/javascript" src="/src/worker.js"></script>
     <script type="text/javascript" src="/external/jpgjs/jpg.js"></script>
+    <script type="text/javascript" src="/src/jpx.js"></script>
     <script type="text/javascript" src="driver.js"></script>
 
     <script type="text/javascript">