Fix XSS issue in poll questions

closes #5274
Merge branch 'hotfix/0.4.1.1'
Merge branch 'master' of github.com:diaspora/diaspora
Merge branch 'master' of github.com:despora/diaspora
Merge branch 'master' into despora