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

diff --cc src/api.js
Simple merge

diff --cc src/core.js
Simple merge

diff --cc src/evaluator.js
Simple merge

diff --cc web/viewer.js
Simple merge