SAK-18021 merge trunk r120348-49

git-svn-id: https://source.sakaiproject.org/svn/podcasts/branches/sakai-2.9.x@121811 66ffb92e-73f9-0310-93c1-f5514f145a0a