Merge branch 'master' into eslint-autofix