EVALSYS-1374  svn merge -c82773 https://source.sakaiproject.org/contrib/evaluation/trunk

git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/1.4.x@83717 fdecad78-55fc-0310-b1b2-d7d25cf747c9