Merge upstream sabermod