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

Conflicts:
	test/pdfs/.gitignore

diff --cc src/parser.js
Simple merge

diff --cc src/stream.js
Simple merge

diff --cc test/pdfs/.gitignore
index 2817f17d3adad36c1da8909a9ad1994215767667,1aae828008a1ba674bb5dcc692f3063f1ac12006..e0926492b647a846d7b7f277972054004c7b16ab
--- 1/test/pdfs/.gitignore
--- 2/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -22,4 -22,4 +22,5 @@@
  !issue918.pdf
  !smaskdim.pdf
  !type4psfunc.pdf
 +!S2.pdf
+ !zerowidthline.pdf

diff --cc test/test_manifest.json
Simple merge