SAK-26248 merge r310628 from trunk


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