Merge branch 'master' into dependabot/npm_and_yarn/ava-6.1.1

# Conflicts:
#	package-lock.json
#	package.json

Author: sosnovsky