Issue 2507

Issue 2507, Ready for review
https://github.com/TEAMMATES/repo/issues/2507
@kai33