[pull] master from mozilla:master#380

pull[bot] merged 2 commits into

code:mastercode/app-pdf.js:masterfrom

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