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 ab2509016dfce3647f0d9681881a898a47ee0604,09d665972748cc80d63b47fc8e680b659a27b78f..98cb456ad04fb055b788709a1e5e996deeed4438
--- 1/src/core.js
--- 2/src/core.js
+++ b/src/core.js
@@@ -306,10 -306,9 +307,10 @@@ var Page = (function pagePage() 
        }
        return links;
      },
-     startRendering: function(ctx, callback, textLayer)  {
 -    startRendering: function pageStartRendering(ctx, callback)  {
++    startRendering: function pageStartRendering(ctx, callback, textLayer)  {
        this.ctx = ctx;
        this.callback = callback;
 +      this.textLayer = textLayer;
  
        this.startRenderingTime = Date.now();
        this.pdf.startRendering(this);