Merge branch 'xss_fixes' of https://github.com/mcreenan/Freeside