Adding the XSS feature.
Merge branch 'master' of github.com:acquia-pso/fix-me