Merge branch 'master' into dependabot/npm_and_yarn/minimist-1.2.6

Author: 9trocode