Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui

Conflicts:
	web/viewer.js

diff --cc src/canvas.js
Simple merge

diff --cc web/viewer.js
index afaf03e04dcd71a8c99d35d616f2bf1f1ff25f98,b596de2137e3d5543cae7590e1a8a3cb23d83b4a..9a7bbb527bbda37362bdb1c06575c9f280f17a31
--- 1/web/viewer.js
--- 2/web/viewer.js
+++ b/web/viewer.js
@@@ -595,13 -774,14 +774,14 @@@ var PageView = function pageView(contai
          this.updateStats();
          if (this.onAfterDraw)
            this.onAfterDraw();
 -      }).bind(this), textLayer
+ 
+         cache.push(this);
+         callback();
 +      }).bind(this), new TextLayerBuilder(textLayer)
      );
  
-     setupLinks(this.content, this.scale);
+     setupAnnotations(this.content, this.scale);
      div.setAttribute('data-loaded', true);
- 
-     return true;
    };
  
    this.updateStats = function pageViewUpdateStats() {