Whoops.

Forgot to commit before merging...
Merge branch 'exam-fixing'