Merge pull request #354 from sanemat/dependabot/npm_and_yarn/conventi… · sanemat/do-not-merge-wip-for-github@785c797