Fix for reflected XSS security issue.
Merge pull request #1150 from neonbunny/next

Fix for reflected XSS security issue.