Merge branch 'master' into font

diff --cc fonts.js
index 57e974e12ad7b5cef4ff7f126c87aa63d1422f37,76facb50424ae4a4cfa1886c5ffbda34bfc6613d..77ad85a00eb74685cc723115616a13d8bb3fdedf
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js
@@@ -385,8 -377,8 +383,9 @@@ var Font = (function Font() 
          warn('Font ' + properties.type + ' is not supported');
          break;
      }
 +
      this.data = data;
+     this.textMatrix = properties.textMatrix || IDENTITY_MATRIX;
      this.type = properties.type;
      this.loadedName = getUniqueName();
      this.compositeFont = properties.compositeFont;

diff --cc pdf.js
Simple merge