Merge branch 'devel'

Added critical fix for negative point totals.
Merge branch 'devel'
Fixed critial bug

Fixed a bug where encountering an error while testing a function whose
output we were checking left the standard in/out streams to be connected
to an internal buffer. That was weird.
Merge branch 'master' into devel
Critical fix for student code setting stack size too large
Merge branch 'master' into devel