Merge remote-tracking branch 'upstream/master' into port-as-pipe

Author: jakub.pawlowski

.gitignore

@@ -21,7 +21,7 @@ results
 
 npm-debug.log
 node_modules
-yarn.lock
+# yarn.lock
 package-lock.json
 
 src/components/oc.json