Merge upstream sabermod

Yup I'll fix that typo.