Fixed issue where slashes were being added to content when output to the page.
Merge branches 'slashesfix' and 'master'