Merge branch 'master' into simplify-log-parameter-names

Author: ricardo-devis-agullo

.gitignore

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