SAK-25287 Reverse-merging r130409

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