Merge upstream

diff --cc src/canvas.js
Simple merge

diff --cc src/evaluator.js
Simple merge

diff --cc test/pdfs/.gitignore
index 09618a7e65a8d73302ae15dfa4232368c0f8e347,49267e36f947a227f1888e343dd5aa3ccd512b21..443cb155afa9c7b7c872133a9f44fd1e7de27d13
--- 1/test/pdfs/.gitignore
--- 2/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@@ -12,5 -12,4 +12,6 @@@
  !rotation.pdf
  !simpletype3font.pdf
  !sizes.pdf
+ !close-path-bug.pdf
 +!alphatrans.pdf
 +

diff --cc test/test_manifest.json
index 1d51c935fc3674b4496a8206b3dd6f8bb09f902d,4837dd2b74d80cd1a6d708e093331a11be8b9e7a..25f609e8dc4103d009a70322da2bd9fdc6bedee6
--- 1/test/test_manifest.json
--- 2/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -218,10 -218,9 +218,15 @@@
         "rounds": 1,
         "type": "eq"
      },
+     {  "id": "close-path-bug",
+        "file": "pdfs/close-path-bug.pdf",
+        "rounds": 1,
+        "type": "eq"
++    },
 +    {  "id": "alphatrans",
 +       "file": "pdfs/alphatrans.pdf",
 +       "link": false,
 +       "rounds": 1,
 +       "type": "eq"
      }
  ]