Merge upstream.

diff --cc src/api.js
index 841f3fe00506708920809bafee53d5c090b91965,b14ea138dddd597db2e30fa3ea5454056693a438..05e8a952fac2c31f200271442d42e6839f3386db
--- 1/src/api.js
--- 2/src/api.js
+++ b/src/api.js
@@@ -79,7 -79,8 +79,8 @@@ var PDFPageProxy = (function PDFPagePro
    function PDFPageProxy(pageInfo, transport) {
      this.pageInfo = pageInfo;
      this.transport = transport;
 -    this._stats = new StatTimer();
 -    this._stats.enabled = !!globalScope.PDFJS.enableStats;
 +    this.stats = new StatTimer();
++    this.stats.enabled = !!globalScope.PDFJS.enableStats;
      this.objs = transport.objs;
    }
    PDFPageProxy.prototype = {