Gradebook

We had implemented a fix in 2.5, and it appears the same fix works in 2.8. 

We've done some initial testing, and things look good. 

I've attached a git diff, it would be good for some others to review the logic and/or test.

Thanks, Steve