Merge branch 'refs/heads/master' into text-select

Conflicts:
	src/core.js

diff --cc src/canvas.js
Simple merge

diff --cc src/core.js
index 98cb456ad04fb055b788709a1e5e996deeed4438,5e97763abc80f58f7c943056b708efc05325ab8d..6308f17fe7e6f164d27ac80531dae37aead7ef56
--- 1/src/core.js
--- 2/src/core.js
+++ b/src/core.js
@@@ -157,8 -160,7 +160,7 @@@ var Page = (function pagePage() 
                                                  IRQueue, fonts) {
        var self = this;
        this.IRQueue = IRQueue;
 -      var gfx = new CanvasGraphics(this.ctx, this.objs);
 +      var gfx = new CanvasGraphics(this.ctx, this.objs, this.textLayer);
-       var startTime = Date.now();
  
        var displayContinuation = function pageDisplayContinuation() {
          // Always defer call to display() to work around bug in

diff --cc web/viewer.css
Simple merge