Merge branch 'master' into eslint-pre-commit.