Merge branch 'master' into predictor

diff --cc pdf.js
index 7a38b9729ccdfc2aeb613c73bf7f11480a7e9413,fb0aeb7ee76b72d47460bbd6c412914b5478d0c3..be324d54f31f3be88deafeccf7981e18f6c433e8
--- 1/pdf.js
--- 2/pdf.js
+++ b/pdf.js
@@@ -539,12 -541,11 +540,15 @@@ var JpegStream = (function() 
      }
  
      constructor.prototype = {
 +        // Needed to pass IsStream test
 +        getChar: function() {
 +        },
 +
          getImage: function() {
              return this.domImage;
+         },
+         getChar: function() {
+             error("internal error: getChar is not valid on JpegStream");
          }
      };