[pull] master from mozilla:master#265

pull[bot] merged 2 commits intocode:mastercode/app-pdf.js:masterfrom

mozilla:mastermozilla/pdf.js:masterCopy head branch name to clipboard