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

Conflicts:
	fonts.js

diff --cc fonts.js
index ac070ed182fc199171113ab511bad1a024eff030,9ba1d876e2ce3390f8ff82ad122370937e90f966..404c3f85342b029656c8ec07981a98d18c2078a5
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js
@@@ -1347,7 -1357,7 +1347,7 @@@ var Font = (function Font() 
        }
  
        // Enter the translated string into the cache
-       return charsCache[chars] = glyphs;
 -      return (charsCache[chars] = str);
++      return (charsCache[chars] = glyphs);
      }
    };
  

diff --cc pdf.js
Simple merge