Merge branch 'master' into next

mcollina · mcollina · commit a3ed5b6d9b11 · 2018-08-10T17:36:22.000+02:00
diff --git a/.npmignore b/.npmignore
@@ -6,4 +6,4 @@ zlib.js
 .zuul.yml
 .nyc_output
 coverage
-docs/
+doc/
