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

diff --cc fonts.js
Simple merge

diff --cc pdf.js
Simple merge

diff --cc test/test_manifest.json
Simple merge