Merge upstream sabermod

Okay, Ill merge after thats fixed