EVALSYS-1432 merge r87289 from trunk


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