SAK-23450
Applying patch from Yuki


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