Merge "Pin eslint version"