SAK-22647 Patch from Juan Jose Merono


git-svn-id: https://source.sakaiproject.org/svn/common/trunk@309718 66ffb92e-73f9-0310-93c1-f5514f145a0a