Fixed a race condition.
Added grading drivers.
Merge remote-tracking branch 'upstream/master'