SAK-27537 merge 310939 to 10.x

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