POLL-143 merge trunk r104603

git-svn-id: https://source.sakaiproject.org/svn/polls/branches/polls-1.4.x@118824 66ffb92e-73f9-0310-93c1-f5514f145a0a