Merge master pre-commit